Revision: bazaar--cached--1.1--patch-4
Archive: aaron.bentley@utoronto.ca--baz
Creator: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Wed Jan 19 20:18:26 EST 2005
Standard-date: 2005-01-20 01:18:26 GMT
New-files: libarch/tests/.arch-ids/unit-patch-id.c.id
    libarch/tests/unit-patch-id.c
Modified-files: commands/ancestry.c commands/commit.c
    libarch/ancestry.c libarch/commit.c libarch/commit.h
    libarch/inv-ids.c libarch/merge-points.c libarch/merge.c
    libarch/patch-id.c libarch/patch-id.h
    libarch/project-tree.c libarch/project-tree.h
    libarch/tests/unit-namespace.c libawk/relational.c
    libawk/relational.h po/en_AU.po tests/test-add.sh
    tests/test-cacherev.sh tests/test-commit.sh
    tests/test-merge.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-4
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-76
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-77
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-78
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-79
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-80
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-81
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-82
    thelove@canonical.com/bazaar--devo--1.1--patch-114
    thelove@canonical.com/bazaar--devo--1.1--patch-115
    thelove@canonical.com/bazaar--devo--1.1--patch-116
    thelove@canonical.com/bazaar--devo--1.1--patch-117
    thelove@canonical.com/bazaar--devo--1.1--patch-118
    thelove@canonical.com/bazaar--devo--1.1--patch-119
    thelove@canonical.com/bazaar--devo--1.1--patch-120
Summary: Merge (Canonical.com Patch Queue Manager)
Keywords: 

Patches applied:
 * thelove@canonical.com/bazaar--devo--1.1--patch-114
 * Ensured .arch-params exists before setting cache path [fixes #5420]

 * thelove@canonical.com/bazaar--devo--1.1--patch-115
 * bugfix: cannot add symlinks to missing paths. closes: #59
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-76
   bugfix: cannot add symlinks to missing paths. closes: #59


 * thelove@canonical.com/bazaar--devo--1.1--patch-116
 * dont use patch_ancestry with an invalid project_tree. closes: #5524
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-77
   use the ancestry cache when pulling ancestry from the archive

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-78
   dont use patch_ancestry with an invalid project_tree


 * thelove@canonical.com/bazaar--devo--1.1--patch-117
 * implement commit --just-commit for scripting support. closes: #55
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-79
   test committing to a named VERSION other than the tree-version

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-80
   implement commit --just-commit for scripting support. closes: #55


 * thelove@canonical.com/bazaar--devo--1.1--patch-118
 * fix committing to a specific version with a non-existant current tree version. closes: #56
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-81
   fix committing to a specific version with a non-existant current tree version. closes: #56


 * thelove@canonical.com/bazaar--devo--1.1--patch-119
 * do not use a cherry picked patch as a common text for a merge base point. closes: #5411
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-82
   do not use a cherry picked patch as a common text for a merge base point. closes: #5411


 * thelove@canonical.com/bazaar--devo--1.1--patch-120
 * fixup en_AU coarse language
